From 4748dbf76f5e8a0fad19da152ac0db51c8e759d5 Mon Sep 17 00:00:00 2001
From: "awilliam@xenbuild.aw" <awilliam@xenbuild.aw>
Date: Fri, 18 Aug 2006 15:01:04 -0600
Subject: [PATCH] [IA64] makes some includes explicit

Make some includes explicit.
Do not compile anymore vmx/mm.c: not used.

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
---
 xen/arch/ia64/linux-xen/iosapic.c           | 2 ++
 xen/arch/ia64/linux-xen/irq_ia64.c          | 4 ++++
 xen/arch/ia64/linux-xen/mca.c               | 1 +
 xen/arch/ia64/linux-xen/process-linux-xen.c | 3 +++
 xen/arch/ia64/linux-xen/smp.c               | 1 +
 xen/arch/ia64/linux-xen/unwind.c            | 3 +++
 xen/arch/ia64/vmx/Makefile                  | 2 +-
 xen/arch/ia64/vmx/mmio.c                    | 2 +-
 xen/arch/ia64/vmx/vmmu.c                    | 1 +
 xen/arch/ia64/vmx/vtlb.c                    | 2 +-
 xen/arch/ia64/xen/acpi.c                    | 3 +++
 xen/arch/ia64/xen/dom0_ops.c                | 1 +
 xen/arch/ia64/xen/dom_fw.c                  | 1 +
 xen/arch/ia64/xen/faults.c                  | 3 +++
 xen/arch/ia64/xen/fw_emul.c                 | 1 +
 xen/arch/ia64/xen/hypercall.c               | 1 +
 xen/arch/ia64/xen/irq.c                     | 1 -
 xen/arch/ia64/xen/mm.c                      | 3 ++-
 xen/arch/ia64/xen/pcdp.c                    | 1 +
 xen/arch/ia64/xen/privop.c                  | 1 +
 xen/arch/ia64/xen/vcpu.c                    | 2 ++
 xen/include/asm-ia64/multicall.h            | 1 +
 22 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/xen/arch/ia64/linux-xen/iosapic.c b/xen/arch/ia64/linux-xen/iosapic.c
index 29a20c58df..90d9ba38f4 100644
--- a/xen/arch/ia64/linux-xen/iosapic.c
+++ b/xen/arch/ia64/linux-xen/iosapic.c
@@ -77,6 +77,8 @@
 #include <linux/list.h>
 #ifndef XEN
 #include <linux/pci.h>
+#else
+#include <xen/errno.h>
 #endif
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
diff --git a/xen/arch/ia64/linux-xen/irq_ia64.c b/xen/arch/ia64/linux-xen/irq_ia64.c
index dccecdf250..b7b82c24e8 100644
--- a/xen/arch/ia64/linux-xen/irq_ia64.c
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c
@@ -40,6 +40,10 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 
+#ifdef XEN
+#include <xen/perfc.h>
+#endif
+
 #ifdef CONFIG_PERFMON
 # include <asm/perfmon.h>
 #endif
diff --git a/xen/arch/ia64/linux-xen/mca.c b/xen/arch/ia64/linux-xen/mca.c
index 6d37730942..1e4a86061b 100644
--- a/xen/arch/ia64/linux-xen/mca.c
+++ b/xen/arch/ia64/linux-xen/mca.c
@@ -79,6 +79,7 @@
 
 #ifdef XEN
 #include <xen/symbols.h>
+#include <xen/mm.h>
 #endif
 
 #if defined(IA64_MCA_DEBUG_INFO)
diff --git a/xen/arch/ia64/linux-xen/process-linux-xen.c b/xen/arch/ia64/linux-xen/process-linux-xen.c
index 228280f2b8..aaaaaca0fe 100644
--- a/xen/arch/ia64/linux-xen/process-linux-xen.c
+++ b/xen/arch/ia64/linux-xen/process-linux-xen.c
@@ -10,6 +10,7 @@
 #include <xen/lib.h>
 #include <xen/symbols.h>
 #include <xen/smp.h>
+#include <xen/sched.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
@@ -166,6 +167,7 @@ show_regs (struct pt_regs *regs)
 	printk("r26 : %016lx r27 : %016lx r28 : %016lx\n", regs->r26, regs->r27, regs->r28);
 	printk("r29 : %016lx r30 : %016lx r31 : %016lx\n", regs->r29, regs->r30, regs->r31);
 
+#ifndef XEN
 	if (user_mode(regs)) {
 		/* print the stacked registers */
 		unsigned long val, *bsp, ndirty;
@@ -180,6 +182,7 @@ show_regs (struct pt_regs *regs)
 			       ((i == sof - 1) || (i % 3) == 2) ? "\n" : " ");
 		}
 	} else
+#endif
 		show_stack(NULL, NULL);
 }
 
diff --git a/xen/arch/ia64/linux-xen/smp.c b/xen/arch/ia64/linux-xen/smp.c
index 67b80710f7..2f4ed8b6a9 100644
--- a/xen/arch/ia64/linux-xen/smp.c
+++ b/xen/arch/ia64/linux-xen/smp.c
@@ -48,6 +48,7 @@
 #include <asm/unistd.h>
 #include <asm/mca.h>
 #ifdef XEN
+#include <xen/errno.h>
 #include <asm/vhpt.h>
 #include <asm/hw_irq.h>
 #endif
diff --git a/xen/arch/ia64/linux-xen/unwind.c b/xen/arch/ia64/linux-xen/unwind.c
index 168948ecc0..2933a5b02f 100644
--- a/xen/arch/ia64/linux-xen/unwind.c
+++ b/xen/arch/ia64/linux-xen/unwind.c
@@ -33,6 +33,7 @@
 #include <xen/sched.h>
 #include <xen/xmalloc.h>
 #include <xen/spinlock.h>
+#include <xen/errno.h>
 
 // work around
 #ifdef CONFIG_SMP
@@ -2315,6 +2316,7 @@ unw_init (void)
 			  __start_unwind, __end_unwind);
 }
 
+#ifndef XEN
 /*
  * DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED
  *
@@ -2353,3 +2355,4 @@ sys_getunwind (void __user *buf, size_t buf_size)
 			return -EFAULT;
 	return unw.gate_table_size;
 }
+#endif
diff --git a/xen/arch/ia64/vmx/Makefile b/xen/arch/ia64/vmx/Makefile
index 0db1f84a4b..9e90d955c9 100644
--- a/xen/arch/ia64/vmx/Makefile
+++ b/xen/arch/ia64/vmx/Makefile
@@ -1,5 +1,5 @@
 obj-y += hvm_vioapic.o
-obj-y += mm.o
+#obj-y += mm.o
 obj-y += mmio.o
 obj-y += pal_emul.o
 obj-y += vlsapic.o
diff --git a/xen/arch/ia64/vmx/mmio.c b/xen/arch/ia64/vmx/mmio.c
index c1de4a786f..5501acb74d 100644
--- a/xen/arch/ia64/vmx/mmio.c
+++ b/xen/arch/ia64/vmx/mmio.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/sched.h>
+#include <xen/mm.h>
 #include <asm/tlb.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/gcc_intrin.h>
@@ -30,7 +31,6 @@
 #include <asm/bundle.h>
 #include <asm/types.h>
 #include <public/hvm/ioreq.h>
-#include <asm/mm.h>
 #include <asm/vmx.h>
 #include <public/event_channel.h>
 #include <public/arch-ia64.h>
diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index 4bff1727ea..9412810f3d 100644
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -33,6 +33,7 @@
 #include <asm/kregs.h>
 #include <asm/vcpu.h>
 #include <xen/irq.h>
+#include <xen/errno.h>
 
 /*
  * Get the machine page frame number in 16KB unit
diff --git a/xen/arch/ia64/vmx/vtlb.c b/xen/arch/ia64/vmx/vtlb.c
index 8d2da7f308..bc6fe21d8f 100644
--- a/xen/arch/ia64/vmx/vtlb.c
+++ b/xen/arch/ia64/vmx/vtlb.c
@@ -23,7 +23,7 @@
 
 #include <linux/sched.h>
 #include <asm/tlb.h>
-#include <asm/mm.h>
+#include <xen/mm.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/gcc_intrin.h>
 #include <linux/interrupt.h>
diff --git a/xen/arch/ia64/xen/acpi.c b/xen/arch/ia64/xen/acpi.c
index 7635cb053d..af1748f1cb 100644
--- a/xen/arch/ia64/xen/acpi.c
+++ b/xen/arch/ia64/xen/acpi.c
@@ -51,6 +51,9 @@
 #include <asm/numa.h>
 #include <asm/sal.h>
 #include <asm/hw_irq.h>
+#ifdef XEN
+#include <xen/errno.h>
+#endif
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
 		(!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c
index e08da03964..f8d2757c2c 100644
--- a/xen/arch/ia64/xen/dom0_ops.c
+++ b/xen/arch/ia64/xen/dom0_ops.c
@@ -21,6 +21,7 @@
 #include <asm/vmx.h>
 #include <asm/dom_fw.h>
 #include <xen/iocap.h>
+#include <xen/errno.h>
 
 void build_physmap_table(struct domain *d);
 
diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index 5eb6643959..2a70b66e66 100644
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -21,6 +21,7 @@
 #include <asm/fpswa.h>
 #include <xen/version.h>
 #include <xen/acpi.h>
+#include <xen/errno.h>
 
 #include <asm/dom_fw.h>
 #include <asm/bundle.h>
diff --git a/xen/arch/ia64/xen/faults.c b/xen/arch/ia64/xen/faults.c
index 171fddd041..f2e3a1bef7 100644
--- a/xen/arch/ia64/xen/faults.c
+++ b/xen/arch/ia64/xen/faults.c
@@ -13,6 +13,8 @@
 #include <xen/smp.h>
 #include <asm/ptrace.h>
 #include <xen/delay.h>
+#include <xen/perfc.h>
+#include <xen/mm.h>
 
 #include <asm/system.h>
 #include <asm/processor.h>
@@ -28,6 +30,7 @@
 #include <asm/bundle.h>
 #include <asm/asm-xsi-offsets.h>
 #include <asm/shadow.h>
+#include <asm/uaccess.h>
 
 extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
 /* FIXME: where these declarations shold be there ? */
diff --git a/xen/arch/ia64/xen/fw_emul.c b/xen/arch/ia64/xen/fw_emul.c
index be96f92a6f..5b8c91cabf 100644
--- a/xen/arch/ia64/xen/fw_emul.c
+++ b/xen/arch/ia64/xen/fw_emul.c
@@ -28,6 +28,7 @@
 #include "hpsim_ssc.h"
 #include <asm/vcpu.h>
 #include <asm/dom_fw.h>
+#include <asm/uaccess.h>
 
 extern unsigned long running_on_sim;
 
diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c
index 6d4927e849..b5321e030c 100644
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@ -11,6 +11,7 @@
 #include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/guest_access.h>
+#include <xen/mm.h>
 
 #include <linux/efi.h>	/* FOR EFI_UNIMPLEMENTED */
 #include <asm/sal.h>	/* FOR struct ia64_sal_retval */
diff --git a/xen/arch/ia64/xen/irq.c b/xen/arch/ia64/xen/irq.c
index 7dd075cd1d..98f11cad11 100644
--- a/xen/arch/ia64/xen/irq.c
+++ b/xen/arch/ia64/xen/irq.c
@@ -40,7 +40,6 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/bitops.h>
-#include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <xen/irq.h>
diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index 35e299c951..eab9391bb5 100644
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -166,7 +166,8 @@
 #include <xen/sched.h>
 #include <xen/domain.h>
 #include <asm/xentypes.h>
-#include <asm/mm.h>
+#include <xen/mm.h>
+#include <xen/errno.h>
 #include <asm/pgalloc.h>
 #include <asm/vhpt.h>
 #include <asm/vcpu.h>
diff --git a/xen/arch/ia64/xen/pcdp.c b/xen/arch/ia64/xen/pcdp.c
index 6c97d87f3c..4f968cd330 100644
--- a/xen/arch/ia64/xen/pcdp.c
+++ b/xen/arch/ia64/xen/pcdp.c
@@ -18,6 +18,7 @@
 #ifdef XEN
 #include <linux/efi.h>
 #include <linux/errno.h>
+#include <asm/io.h>
 #include <asm/iosapic.h>
 #include <asm/system.h>
 #include <acpi/acpi.h>
diff --git a/xen/arch/ia64/xen/privop.c b/xen/arch/ia64/xen/privop.c
index a66e215321..31e1ebc198 100644
--- a/xen/arch/ia64/xen/privop.c
+++ b/xen/arch/ia64/xen/privop.c
@@ -13,6 +13,7 @@
 #include <asm/dom_fw.h>
 #include <asm/vhpt.h>
 #include <asm/bundle.h>
+#include <xen/perfc.h>
 
 long priv_verbose=0;
 unsigned long privop_trace = 0;
diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index 39f9b1d8ed..7ab3197393 100644
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -8,6 +8,7 @@
 
 #include <linux/sched.h>
 #include <public/arch-ia64.h>
+#include <xen/mm.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>
@@ -22,6 +23,7 @@
 #include <asm/vmx_phy_mode.h>
 #include <asm/bundle.h>
 #include <asm/privop_stat.h>
+#include <asm/uaccess.h>
 
 /* FIXME: where these declarations should be there ? */
 extern void getreg(unsigned long regnum, unsigned long *val, int *nat, struct pt_regs *regs);
diff --git a/xen/include/asm-ia64/multicall.h b/xen/include/asm-ia64/multicall.h
index ea104e5efa..15b825bbf0 100644
--- a/xen/include/asm-ia64/multicall.h
+++ b/xen/include/asm-ia64/multicall.h
@@ -2,6 +2,7 @@
 #define __ASM_IA64_MULTICALL_H__
 
 #include <public/xen.h>
+#include <xen/errno.h>
 
 typedef unsigned long (*hypercall_t)(
 			unsigned long arg0,
-- 
2.30.2